Merge tag 'upstream/2017.7' into debian/master
authorSimon McVittie <smcv@debian.org>
Wed, 21 Jun 2017 08:52:08 +0000 (09:52 +0100)
committerSimon McVittie <smcv@debian.org>
Wed, 21 Jun 2017 08:52:08 +0000 (09:52 +0100)
commit31880a6e5c9755d1effc19cbd5e4bdf216d73cac
treeb70a2b09f1cd30aec61f688b5acb8ad0e218110f
parentc948e18a885233be401c76b1aa74ccb3185c2334
parent19f82ee114e1cd71e1d3f7aee7330e8dcfde8ada
Merge tag 'upstream/2017.7' into debian/master

Upstream version 2017.7